Repository navigation
fix(eessi-extend): the current EESSI, the compat layer from EESSI_EPREFIX, and a named user prefix created - #27
Merged
Merged
Conversation
Release notes went into CHANGELOG.md by hand, so any two pull requests that touch it conflict. The other stackhands repositories take one fragment per change in changelog.d/ and build the section at release with towncrier. towncrier.toml follows theirs, with this changelog's heading and section names. A workflow drafts the changelog on each pull request, with the version from Cargo.toml, and checks that a misnamed fragment fails. CONTRIBUTING asks for a fragment and puts towncrier build in the release steps.
…EFIX, and a named user prefix created eessi-extend-eb.sh defaulted to EESSI 2025.06 while the docs and the CLI default to 2026.06. It put the compatibility layer's ld on PATH only when EESSI_VERSION was set, so the default version ran without it. It created the user prefix only when no prefix was set, so a named EESSI_USER_INSTALL that did not exist yet made EESSI-extend refuse to load. The script now defaults to 2026.06, reads the repository from EESSI_CVMFS_REPO, and takes the compatibility layer from the EESSI_EPREFIX that the init sets, falling back to the path built from the version. It refuses two prefixes before creating anything and creates any user prefix, never a project or site one. The Cargo prelude takes the layer from EESSI_EPREFIX the same way, and the example target names 2026.06. tests/eessi_extend_eb_script.rs runs the script against a fake repository whose init defines module and whose eb prints its environment.
A missing rustc failed the wrapper under pipefail before EasyBuild ran, and CI never executed the new script test. The Cargo prelude follows EESSI_CVMFS_REPO when EESSI_EPREFIX is unset.
…mpty EESSI-extend treats a prefix variable as set when it is present, including an empty value. The wrapper counted only non-empty values, so an empty EESSI_SITE_INSTALL also exported EESSI_USER_INSTALL and the module refused the combination.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
scripts/eessi-extend-eb.shhad three problems:--eessi-versiondefault to 2026.06.ldonPATHonly whenEESSI_VERSIONwas set, so a run on the default version went without it.EESSI_USER_INSTALLthat did not exist yet made EESSI-extend refuse to load.Changes:
EESSI_CVMFS_REPO(default/cvmfs/software.eessi.io), so a mirror or another EESSI repository works;EESSI_EPREFIXthat the init sets, falling back to the path built from the version;eessi_cargo_host_isolation()takes the layer fromEESSI_EPREFIXthe same way, andexamples/targets/eessi-extend.tomlnames 2026.06.Tests: new
tests/eessi_extend_eb_script.rs(7 tests) runs the script against a fake repository whose init definesmoduleand whoseebprints its environment.cargo test --lib933 passed;--test pypi_cran_extend22 and--test target_config13 passed.cargo fmt --check, clippy on the new test with-D warnings, andshellcheckpass.towncrier build --draftrenders the fragment.Merge #26 first; this adds a fragment to its
changelog.d/.